From cab2213eae8cf5138d682c5ff85cf0cc2b75a709 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 5 Jun 2024 13:30:31 +0200
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 551895 -> 552614 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index d9ce2736834..fdf4ea863c3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -926,7 +926,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 ))
diff --git a/configure.ac b/configure.ac
index 92979b676ce7559049d0c65353e5945b65f6f0fa..a76a8daefe66d01ce9bc597255b175f0761d480d 100644
GIT binary patch
delta 570
zcmcb9U2)l6#fB}6PUXB@3P2E@l~|UTlAk=;uuN?F9(hI{p7P9+3|*+`^jk%YQtU8J
zdKsfSix*J+^m}EDlGE3eF>-N2<rGpTAN(oC;qT(D08`*J{eLT?;&jgpMj^Nf3T2FH
z@?d*ob#x&1gRF~(nqpg-S{&PMT+Rr@OhC-M-ME}3!$~kTFEJ@6H9kKjTS-CDRv|Bc
z`njzvTGRLMWC;@I%uG`#Ni8l>P*OoQYWl~?OcIkfh_OtU+{I!%J$)k!-}JZJfJDkJ
z7K!OnR~UJx&zZ-<IlXTei_G*7LhP*5SMOqxn_jh@NoIQ8Ek>^C&v&s%P4BkjP@FEi
zn?-DTfC9Vdbcfw6M$>PeW)Yw6zkro%`u*w5BGWIdVica%#KJRu-EJ1!=^u^)S?_nV
z$WGqH&NV%um4$cux&tg6)1~*Y=uSRtEHPc~3M0q#e=AworpN7JF`v%6h>2tR)IBVc
zuAs;OfwW96PKDH*;#4k9PKDCE;?xoaFUK%P7k_7<I8YL*2CM?aMo}_-!yXn9MbBV&
yFQ9r&E=15kjeyF40!N$|L#NpE<n?Sq)6Y+5;cox4hXsgPftYRkpFQli*8u=3QO08c

delta 227
zcmZ2>SMmCF#fB}6PUY>7D;R;835c1uKdxYjbeev16^qLBf@(I7>Giu=yr$1-W8#?p
zXE%%S^xyMYB&K`s0TR1*un0}B+`}R>edZn(`RTXfm_(+_-(lpMes2$p)O76>7Ou$~
zlv$>&Vdk9vAe)J0y2M@<@yQ>S@lAK#%VIdab|;JH^y_<B45st%V^N&$y_Si4y7xYy
zgjo)g!1Ou$SZt?1+{Yq0-Rc)Rzk-)zn4^oovnH3Lb9`{9Q*ej|RKzpb-3ur&-Cz@&
VNc(~PEI`Z(#BAFS>}P+r4gmEpSk(Xk

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0095619d50..eeb4afa2a51 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 8b8ee8ccaac..073f048998f 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -42,8 +42,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2